From 962cfc3a3a64019323b311e4b13ca1150d59e306 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 31 May 2005 15:52:06 +0000 Subject: [PATCH] bitkeeper revision 1.1615.1.2 (429c8826fS2FuIKb-STmuvL0Hl6awQ) ioemu fixes: do not install into /usr/share/qemu as it conflicts with real qemu installations. Also, do not link x86/64 with a special linker script -- breaks on SLES9 and ought to be unnecessary. The linker scripts and configuration/Makefile environment all need stripping out at some point. Signed-off-by: Keir Fraser --- tools/ioemu/configure | 2 +- tools/ioemu/target-i386-dm/Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/ioemu/configure b/tools/ioemu/configure index f766fbcc3a..f49a38ca9f 100755 --- a/tools/ioemu/configure +++ b/tools/ioemu/configure @@ -338,7 +338,7 @@ if test -z "$prefix" ; then prefix="usr/local" fi mandir="$installroot/$prefix/share/man" -datadir="$installroot/$prefix/share/qemu" +datadir="$installroot/$prefix/share/xen/qemu" docdir="$installroot/$prefix/share/doc/qemu" bindir="$installroot/$prefix/bin" configdir="$installroot/etc/xen" diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile index 55a30f5dcf..bfe8befc25 100644 --- a/tools/ioemu/target-i386-dm/Makefile +++ b/tools/ioemu/target-i386-dm/Makefile @@ -304,7 +304,9 @@ VL_LDFLAGS= ifdef CONFIG_STATIC VL_LDFLAGS+=-static endif +ifeq ($(XEN_TARGET_ARCH),x86_32) VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(XEN_TARGET_ARCH).ld +endif ifndef CONFIG_DARWIN ifndef CONFIG_WIN32 VL_LIBS=-lutil -- 2.30.2